diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 42fc602..e94139d 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -320,7 +320,6 @@
 	return spl;
 }
 
-#ifdef CONFIG_SPL_LOAD_FIT
 static const char *get_spl_dt_name(void)
 {
 	struct boot_file_head *spl = get_spl_header(SPL_DT_HEADER_VERSION);
@@ -331,7 +330,6 @@
 
 	return NULL;
 }
-#endif
 
 int dram_init(void)
 {
@@ -857,6 +855,7 @@
 
 int misc_init_r(void)
 {
+	const char *spl_dt_name;
 	uint boot;
 
 	env_set("fel_booted", NULL);
@@ -875,6 +874,16 @@
 		env_set("mmc_bootdev", "1");
 	}
 
+	/* Set fdtfile to match the FIT configuration chosen in SPL. */
+	spl_dt_name = get_spl_dt_name();
+	if (spl_dt_name) {
+		char *prefix = IS_ENABLED(CONFIG_ARM64) ? "allwinner/" : "";
+		char str[64];
+
+		snprintf(str, sizeof(str), "%s%s.dtb", prefix, spl_dt_name);
+		env_set("fdtfile", str);
+	}
+
 	setup_environment(gd->fdt_blob);
 
 #ifdef CONFIG_USB_ETHER